merge from upstream

author Joakim Verona <joakim@verona.se>

Fri, 20 Aug 2010 20:00:00 +0000 (22:00 +0200)

committer Joakim Verona <joakim@verona.se>

Fri, 20 Aug 2010 20:00:00 +0000 (22:00 +0200)
author Joakim Verona <joakim@verona.se>
Fri, 20 Aug 2010 20:00:00 +0000 (22:00 +0200)
committer Joakim Verona <joakim@verona.se>
Fri, 20 Aug 2010 20:00:00 +0000 (22:00 +0200)
diff --cc lisp/ChangeLog
Simple merge
diff --cc src/ChangeLog
Simple merge
author	Joakim Verona <joakim@verona.se>
	Fri, 20 Aug 2010 20:00:00 +0000 (22:00 +0200)
committer	Joakim Verona <joakim@verona.se>
	Fri, 20 Aug 2010 20:00:00 +0000 (22:00 +0200)
		1	2
lisp/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history